From ea24fa62c877d4d81a1d903a8fae55b9e772a0b2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 26 Jan 2011 11:17:34 -0500 Subject: [PATCH] Privately export css_provider_get_theme_dir --- gtk/Makefile.am | 1 + gtk/gtkcssprovider.c | 9 +++++---- gtk/gtkcssproviderprivate.h | 31 +++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 gtk/gtkcssproviderprivate.h diff --git a/gtk/Makefile.am b/gtk/Makefile.am index b95a5d47e6..09060ac87a 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -383,6 +383,7 @@ gtk_private_h_sources = \ gtkbuilderprivate.h \ gtkbuttonprivate.h \ gtkcellareaboxcontextprivate.h \ + gtkcssproviderprivate.h \ gtkcustompaperunixdialog.h \ gtkdndcursors.h \ gtkentryprivate.h \ diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index 7853b05f1c..0e3b84b34c 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -25,12 +25,13 @@ #include #include +#include "gtkcssproviderprivate.h" + #include "gtkanimationdescription.h" #include "gtk9slice.h" #include "gtkgradient.h" #include "gtkthemingengine.h" #include "gtkstyleprovider.h" -#include "gtkcssprovider.h" #include "gtkstylecontextprivate.h" #include "gtkprivate.h" @@ -3936,8 +3937,8 @@ gtk_css_provider_get_default (void) return provider; } -static gchar * -css_provider_get_theme_dir (void) +gchar * +_gtk_css_provider_get_theme_dir (void) { const gchar *var; gchar *path; @@ -4000,7 +4001,7 @@ gtk_css_provider_get_named (const gchar *name, if (!path) { - gchar *theme_dir = css_provider_get_theme_dir (); + gchar *theme_dir = _gtk_css_provider_get_theme_dir (); path = g_build_filename (theme_dir, name, subpath, NULL); g_free (theme_dir); diff --git a/gtk/gtkcssproviderprivate.h b/gtk/gtkcssproviderprivate.h new file mode 100644 index 0000000000..02828e2b23 --- /dev/null +++ b/gtk/gtkcssproviderprivate.h @@ -0,0 +1,31 @@ +/* GTK - The GIMP Toolkit + * Copyright (C) 2011 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GTK_CSS_PROVIDER_PRIVATE_H__ +#define __GTK_CSS_PROVIDER_PRIVATE_H__ + +#include "gtkcssprovider.h" + +G_BEGIN_DECLS + +gchar *_gtk_css_provider_get_theme_dir (void); + +G_END_DECLS + +#endif /* __GTK_CSS_PROVIDER_PRIVATE_H__ */ -- 2.30.2